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

Change-Id: Ie90342ef543ed0803fc279adbfb3e919f6bf63d5