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

Change-Id: Ie0faa6b5ebb46664e4e39e4a8dc2a6b9161baefd