m7-common: HTC camera expects insecure MM heap

Change-Id: Ie31f11c39b12d7569196ea63b2f3db7b84697945
m7-common: fix copy paste

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