Merge "Compile dx as java 1.7"