Android m preview 1
Merge "Remove copied reference to undefined local_javac_flags"