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