m7-common: camera: clean up code style

Conflicts:
	camera/CameraWrapper.cpp

Change-Id: I10c72ae6bd697d960da48d6cd0261cf162d2d8db
Merge "m7-common: camera: clean up code style" into android-4.4