am 28acb6fe: Merge "Remove libcxx.mk cruft."

* commit '28acb6feb50951645c37c077bd3897ea760ca322':
  Remove libcxx.mk cruft.