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

* commit '79d0db0a1fab87781ea3131d482143b349faef59':
  BuildDalvikSuite: Remove the unused scanner2