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

Change-Id: I36ba918f45352256d36c72d5f30f50672993e825