Merge "Remove checks for _USING_LIBCXX" am: 3a4591c750 am: 38faafccb1
am: 2d9f231b02

Change-Id: I760e5e6140bcf7b4064123fb08b292bd0f76bfff