Merge "sepolicy: fix mac build" am: 4fa9b85632
am: 96ef66abd4

Change-Id: If199e836df5b660924f475cf30e9d27a25a5f8f4