Merge "resolve merge conflicts of 78291319 to nyc-dev" into nyc-dev am: 388d5758

am: 514989c8

* commit '514989c8':
  Delete all of the tools/ directory, but save the adk files by moving them up. Redirects for all the tools/ files are already in Piper's site-android/en/_redirects.yaml file. The new adk redirects are in this cl: https://critique.corp.google.com/#review/121302608

Change-Id: I30a4d3aa9255b9049c9c294c0efbde79f5a25587