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

Change-Id: I76e968b211870d32c752f9db9824b9454a22b3d0