Merge "vndservicemanager: use selinux_vendor_log_callback" am: 5cacd7ca04
am: cef297f7c0

Change-Id: I87346a9ddd2f1d4f6ecdfd65ec5eae529bb3f163