Prima 3.2.3.158

Change-Id: If5cecbb2f8d8f87dcbae39b85cc2e08298ed8ca2
apexq: update defconfig

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