Merge "Remove android_prebuilt_sdk modules"
am: 5012c81888

Change-Id: Iebbfa1a3fecac0feafa8f8c83d2d051368535aee