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

Change-Id: I9de9eb1bf40b03f8e6e4bee96028f599b4d9cd7c