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

Change-Id: I9562c0830a863e8db6d83b1a6e1c03d5d3b0fadc