Fix camera (thannks NLJ)

Change-Id: I01c6016ea5b84f5f1a2aea91416dd445ed386d56
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h
	services/camera/libcameraservice/Android.mk