Merge "Remove gnustl modules."
am: 3ea01a73dd

Change-Id: Idf3d52d2844e91e89fb6258a05798d2ef9b17b91