wifi: bring in settings from msm8960-common

* d2 is going module-less, jf will later

Change-Id: I35eca346ce14231e48b40a85a7cd4aaa28492418
Merge branch 'cm' into HEAD