Merge "vndk-def: Add VNDK comments to libselinux"