am 96c109e8: Merge "Revert "Revert "Rewrite mac_permissions.xml file."""

* commit '96c109e8f6de0a2541aabccacecec65bd5ec4c31':
  Revert "Revert "Rewrite mac_permissions.xml file.""