d2: Enable built-in WiFI

Change-Id: I421b44af62e63f594be4204957c34ce46cb00a43
Merge branch 'cm-11.0' into kk_mkt