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

* commit '06e62ab24e0b90707ab92da26e0726405ed7856e':
  Remove uses of libcxx.mk.