Merge "CTS: Fix BuildDalvikSuite file reading"