Merge "Remove libselinux_vendor" am: cd4895df08 am: 016e9504ae am: ad119fd2ad
am: 886d5976b4

Change-Id: I5b610cd06b89c14a34b5d42ad7270cf1b8c45a6c