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

Change-Id: I1cc57c63331f8e7415f9d10993aee313f7bb08c0