Merge "Make javac always use Java 7 when running tests using javac and dx"