camera: add more htc parameters

Google Edition

Change-Id: I67968ea749dec0bf3810110f99bccdd3edee3428
Merge remote-tracking branch 'cm/cm-10.1'
CameraParameters: Remove duplicate if-def's

Fixes compile error on HTC MSM7x27A

Change-Id: Ib0b6b5079779cebf027ab687d3173180c7aa5c8f