Merge "SELinux changes for AppFuse" am: f0dc093667
am: 31fe684219

Change-Id: Ia031bcab6c0fafefb3aa0cc8a920f8c109a2dbd9