tenderloin:  Camera fixes

Still doesn't work but got it compiling for now

Change-Id: If0316c680f9e2ba6361c15c95884778b9772cce7