am de7e352b: am ddb45cd3: am 68251f81: Merge "Adjust sdk to new prebuilts location."

# Via Android Git Automerger (2) and others
* commit 'de7e352b15e83b50d3003d92561b8942e3bfdadc':
  Adjust sdk to new prebuilts location.