camera: fixup htc params

Change-Id: Iee0086e8a7319ada09f5191092c314c099e0d66a

Conflicts:

	camera/CameraParameters.cpp
	include/camera/CameraParameters.h
camera: add more htc parameters

Google Edition

Change-Id: I67968ea749dec0bf3810110f99bccdd3edee3428

Conflicts:

	camera/CameraParameters.cpp
	include/camera/CameraParameters.h