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

* commit 'd1e1073b6b515eed38148027b268269261b6f1d4':
  BuildDalvikSuite: Remove the unused scanner2