Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"