Merge "Add libc++ as static library" am: 679185dc88 am: 003672e013
am: 064070c633

Change-Id: I7e751fd58560cfe45d01f4e1b0509726c9dc785a