Merge "[API-1074][wifi][bcmdhd]modify bcmdhd ver 100_10_96 from NO-connman branch" into MR3.0-merge