Merge "Add /product sepolicy support to SELinuxMMAC.java" am: f3a8a47d61
am: 2ff8fbf18c

Change-Id: Id866f3b24389adbd5a0e3e6b725fda5ae3ec9bba