Some camera wrapper cleanup and changes

Change-Id: I81a3524bc5a187c19a85139d670fc78004224d4a
Disable CCX support in Prima config

Change-Id: I85952a4eabc0bdcd53c251636b7c6b89d9b4ba92
Remove unused option from camera makefile

Change-Id: Ib6c532e399d458e344e39caf15b89d9192e77376
Merge branch into kk_mkt