Merge "Don't set REVOKED_COMPAT for modern apps."