Merge "Grant OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to Shell"