Merge "Remove uses of libcxx.mk."