Merge "Move from stlport to libc++."