Merge "Move to libc++ from stlport." am: abbbdbeed9
am: 71f4ea894c

Change-Id: I3ea50508f28c5900d7ddc904b10e54fbeb577cf6