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

Change-Id: I1ff7f15d743b36b302901b66a932d4b9de7f4b87