am cc47075c: Merge "Remove uses of libcxx.mk."

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