Merge "Fix SELinux policies to allow resource overlays."