am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"

* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC