am 1df8d179: am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"

* commit '1df8d17911ce14b9c32634e5d10ec389efaf4ed0':
  Add support for ALTERNATE_JAVAC