Merge changes I5142492a,I8a8139bd into msm-3.4

* changes:
  defconfig: wcnss: Enable wcnss pre-alloc memory
  wcnss: Pre-alloc memory for WLAN driver