am b68b6b55: am f51f24a6: Use the new sdk/build/tools.atree.

Merge commit 'b68b6b558b779f731613b5ebf6fe9090c319ce65'

* commit 'b68b6b558b779f731613b5ebf6fe9090c319ce65':
  Use the new sdk/build/tools.atree.