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

am: 388d575893

* commit '388d575893631e778447b6ac1decff12277946d3':
  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: I9ab3833eaaf22919312af1e90c51b787ed33d578