Merge "Export javac classes" into main