Camera: Add more htc parameters

Change-Id: Ica43a42f6ec6e25671b22536c768140469fb9824
Merge "Camera: Add more htc parameters" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1