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

Change-Id: I62c349b755d4d70a441bb1e12a4f895e301e8dd2