Merge "Remove libcxx.mk cruft."