camera: fixup htc params

Change-Id: Iee0086e8a7319ada09f5191092c314c099e0d66a
Merge remote-tracking branch 'camcory/cm-10.1' into HEAD

Conflicts:
	camera/CameraParameters.cpp
	media/libmedia/mediaplayer.cpp
	services/camera/libcameraservice/Android.mk

Change-Id: I29751b18efb9056100981c346becd8414901765c