Merge "Obviate libbinder_ndk_host_user."