Merge "Move mac_permissions to etc/selinux" am: b063fe384f
am: 1376b937ed

Change-Id: Iac3ff86d133cbd8cdbee69456be0677a5c2f7c51