Merge "Make derive_sdk_prefer32 uninstallable" am: 042054ad5a am: b9c7af6362

Change-Id: I2976d37f05ec77b9a058dc721d0ef7dcd1d89b0b