am 2e8c9e1b: am 6502a1b2: Merge "Add support for build-tools in ADT."

* commit '2e8c9e1b0b0fec25b357d12c2af42853fff35726':
  Add support for build-tools in ADT.