Revert "Use dx.jar directly"

This reverts commit e37a3c959a833b9979f7e820cb037711c7453c16.

Reason for revert: breaks art test runner

Change-Id: Ice0cd3020ddec7f31eb789867a45f047a75a05d0
4 files changed