camera: Cleanup & remove compiler warnings

Change-Id: I686c88e82a83072b9f392369960160e8ec345e30