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

* commit '6e984e2d8cfc3ac7affa59e8b7440c8e5fc8b16f':
  Add support for ALTERNATE_JAVAC