am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"

* commit '96e487b262c2d5d7c02d49e29e71895588e15549':
  javac: rename common_flags to avoid conflictions

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build