am 4b43b879: am 9ce2d0bb: am 06e62ab2: am cc47075c: Merge "Remove uses of libcxx.mk."

* commit '4b43b8798c5ed01b78f96a664f01f2111323fea8':
  Remove uses of libcxx.mk.