s4-common: camera: clean up logging and code style

Change-Id: If67220669a9bce6d909354d7b3ec0959f8b1cd71

Conflicts:
	camera/CameraWrapper.cpp
s4-common: camera: fix possible memory leak

Change-Id: I63cee86a176bfd8728cc682890ded920661dd281
s4: Re-add digital dock routes for LPA and tunnel

* Change got stomped when updating to 4.4
* For supporting music playback over USB.

Change-Id: Ida5b807e391be8349db52fa5d21a5c8852d1db65