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

Change-Id: If67220669a9bce6d909354d7b3ec0959f8b1cd71
s4-common: camera: fix possible memory leak

Change-Id: I63cee86a176bfd8728cc682890ded920661dd281
Merge branch 'cm' into HEAD