Merge "wcnss: remove obsolete define WCNSS_NV_NAME" into msm-3.0