Merge "remove libbinder_ndk_host_user" am: 415611420c am: d18fa8a030

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1940659

Change-Id: I60e67a62fad9f11cb027627f9aa6081a6d14364d