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

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