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

Change-Id: I89a9c3b22f3adee6c4d4166e8e710b2a075fc681