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

Change-Id: I3c7f169097ef1c4d17263893a18ad21b9dae7d49