Merge "libbt: fixup build errors when building the library under vndk."