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

Change-Id: I6974599b9ecc5652b7a33588638213e09cd6ea78