Merge "DO NOT MERGE. Move to using prebuilts/fullsdk instead of prebuilts/sdk" into nyc-support-25.1-dev
am: 80d18ea10b  -s ours

Change-Id: Ie2f4187b42413d72f36bbccdf25fc6b9c51b3b6d