Merge "Move to libc++ from stlport." am: c6dd5f9037 am: 81da46f982
am: eff28b5863

Change-Id: Ia45b5a174feaddff5e5839a231af18fb5bb3cb7a