camera: update defines for CM-10.1

Change-Id: Ic5d0e8ff1235e66556fe477ba87b52a035bda83b
camera: clean up Makefile

Change-Id: I5fe4ad8670eb62ff0d0f4abc6ef50f08d68cf0a2