m7-common: camera: clean up code style

Change-Id: Ib2d24a0182dbf6cbbb709cede8926aefb893a90c
m7-common: camera: fix possible memory leak

Change-Id: I23dca14c2565f66f0e6577076c9286e0cf72c71d
Merge branch 'cm-11.0' into martincz