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

Change-Id: I911ee1063c1e16f444bac600c9f852d3e1d7c515