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

Change-Id: I7a70cf7352842810e9ee1edcddc851fef9c3cc66