Merge "Revert "Use dx.jar directly"" am: c7e3e962f8
am: 4cea760106

Change-Id: Ifc9f3c171a8798968d07d7a3a87bff43c24048e4