Merge "CTS: Refactor BuildDalvikSuite" am: 11ca14efcb
am: 36794d77f5

Change-Id: I09982ada34948e1ca0ed9b9b63b49eab23f86987