Merge "selinux: account for /product hash"