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

Change-Id: If65083e9b676bc6c0ab425165d3d9ece306e338a