am 202a8d6c: am d1e1073b: am 79d0db0a: Merge "BuildDalvikSuite: Remove the unused scanner2"

* commit '202a8d6c46c769626f6ac6971db9a4dc2188ee6a':
  BuildDalvikSuite: Remove the unused scanner2