Merge "Remove android_prebuilt_sdk modules" am: 5012c81888 am: dcceaa48bb am: 9654d2f7b8
am: 23c2a1d741

Change-Id: Ie93ad5d1e1b11e8ca6b0241152fe9526779fb8ed