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

Change-Id: I6a56fdb26d273df5761d077d6aebfb35cfe1610c