Camera: Fix some derp

This commit removes some derp and code styling issues
interdruced by recent merged commits.

Change-Id: I6ac39f2bd66bf352b48696a3aa7b005edc9fa527
Merge "Camera: Fix some derp" into cm-10.1
merge changes from remotes/github/cm-10.1 into master