am 1da2494f: Merge "Remove copied reference to undefined local_javac_flags"

* commit '1da2494f7a98a8e85c9115fb012b798c9facc68f':
  Remove copied reference to undefined local_javac_flags