Android m preview 1
Merge "Remove uses of libcxx.mk."