Merge "Add missing headers to libbt-vendor"