Merge "Make derive_sdk_prefer32 uninstallable" am: 042054ad5a

Change-Id: I9d70d9ff7ae53347a703b4549191abebce10ca6b