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

* commit '47cf57aef29fd05e7bcc994c76a841856b7dc1c7':
  Remove uses of libcxx.mk.