Merge "Compile dx as java 1.7" am: fe4d906e50
am: a3482342e7

Change-Id: I6a73cece78d801db86e58bdad6dc379e103f7c37