Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""