Android n mr2 preview 1
Merge "Remove obsolete clang makefiles"