Camera: Add more htc parameters

Change-Id: Ica43a42f6ec6e25671b22536c768140469fb9824
Merge remote-tracking branch 'lq/jb2'; commit 'HEAD' into HEAD