Merge "Merge "Make derive_sdk_prefer32 uninstallable" am: 042054ad am: b9c7af63" into rvc-dev-plus-aosp