Merge "Revert "priv_app: use per-app selinux contexts""