Merge "resolve merge conflicts of 78291319 to nyc-dev" into nyc-dev

am: 388d5758

* commit '388d5758':
  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: Ib398d3c4bd720962b334f8d3ea872351c0117042