Merge "Remove checks for _USING_LIBCXX"
am: 3a4591c750

Change-Id: I91c37cee2a300d4fafcc12dbed290077315e8619