Merge "Add targets for building individual modules using javac"