Merge tag 'AU_LINUX_ANDROID_KK_2.7-STABLE.04.04.03.015.289' into cm-11.0

AU_LINUX_ANDROID_KK_2.7-STABLE.04.04.03.015.289 based on quic/aosp/kk_2.7-stable
Sync prima with kk_2.7-stable

Change-Id: Ic3595adcbd31243b4abbc96a8fa8f3f5162d50b2
Fixup a merge

Change-Id: I04dfd09c1878d98f11efa135fe1f1d991b60ab23
Wlan: Sync prima with kk_2.7-stable
Signed-off-by: shivamk11 <shivamk11@gmail.com>
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0