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