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

Change-Id: If67220669a9bce6d909354d7b3ec0959f8b1cd71