Merge "CTS: Fix BuildDalvikSuite file reading" am: b381b26dad am: 246f0cff32
am: 384a95911b

Change-Id: I19791b671059d2f73253788dc56422377d131ae8