Merge changes from topic "presubmit-am-12394aafba3f4f85823b8d6d9815f908"

* changes:
  [automerged blank] Obviate libbinder_ndk_host_user. 2p: 5c4dd9ffb3
  Obviate libbinder_ndk_host_user.