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

Change-Id: Ic7912a5076e2f36a1093a04b43d2470ea37d710c