Camera: fix pinch to zoom for some devices

Change-Id: I421f29e120de640ed47543df689a680aa2d6b7bf
Merge remote branch 'cm/cm-10.1'