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

* commit '10cc88c1a5b935c7850658b8b5fa2eda7a36807e':
  Remove uses of libcxx.mk.