am bfebb61b: am 10cc88c1: am e29744d9: Merge "Remove uses of libcxx.mk."

* commit 'bfebb61b4c0c63e5ecc2043354f07318b0e576ef':
  Remove uses of libcxx.mk.