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

Change-Id: I1c2b1f760b34b76fb63ac0ad7816680a7dc9d3a0