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

* commit '6502a1b2a4a41eb1699ad29df3e5ec8df4fb2800':
  Add support for build-tools in ADT.