Merge "Use dx.jar directly" am: c68434c971
am: 4828fcad41

Change-Id: I0e65499eaf42aef400be07868e40454cd1c2d5ac