Merge "libselinux: fix build warning" am: 31a6155a15
am: f9279b9fca

Change-Id: I7de9f2866e00ba0c7c9bb610f00bdef599449c08