Merge "selinux: account for /product hash"
am: 9ffdf5945d

Change-Id: I6241260a77c329222dede7f7ea7e0ea1c226e272