Merge "msm: pil-riva: allow forcing of insecure mode" into cm-10.2
Merge "apexq: update defconfig" into cm-10.2