Merge "Revert "DO NOT MERGE. Move to using prebuilts/fullsdk instead of prebuilts/sdk"" into nyc-support-25.1-dev