Merge "wcnss: Permit the module to be statically linked into the kernel" into msm-3.0