Merge "Remove gnustl modules." am: 3ea01a73dd am: c78cdc6a74
am: 46203a3ca2

Change-Id: I55739f51d814a7a930ad0fd8a82fe69b16321826