Merge "Add support for ALTERNATE_JAVAC"