Merge "Testrunner: Temporarily fix long Dex File name issue" am: c64fb4d48a
am: b18d889393

Change-Id: I0168d2b172b6bbee839741a27904d14b498dcd80