msm: HTC: 8960: update network options

Change-Id: I1ccf5182e19c89a9455121de554c62f44772aa3e
msm: HTC: 8960: regenerate defconfigs

Change-Id: I472ff1109d9b42b2884a03fb9a44e8a398cd90b5
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2