Merge "BuildDalvikSuite: Remove the unused scanner2"