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

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