bcmdhd: merge Huawei changes