Merge "Mods to the SELinuxMMAC engine code."