am f3b23f23: Clean up interaction with libbt-vendor library.

* commit 'f3b23f231a39176ea371c4da717e084b3d7cc15a':
  Clean up interaction with libbt-vendor library.