Merge "Move from stlport to libc++."
am: 6924e012fd

Change-Id: I609e738ed6ea191c2c926dc3ade190c652726d20