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

* commit '98c7252113ad4adfc11bb500d737b96c0544106f':
  Add support for ALTERNATE_JAVAC