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

* commit '9ce2d0bb3702f2854e612cb743f4c508dd590981':
  Remove uses of libcxx.mk.