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

am: 594af335

* commit '594af335':
  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: I6ad20f97ab0b7d9ca77d99281ddeb8a376ab9e85