Merge "Move from stlport to libc++." am: 6924e012fd am: 268c9153a3
am: 0d9941f3db

Change-Id: I88e4a71238d6f6e0d20c1c36b19d464202022479