Some camera wrapper cleanup and changes

Change-Id: I81a3524bc5a187c19a85139d670fc78004224d4a