jf: CameraWrapper: clean up stuff left over from d2

Change-Id: Ife9ac2c8ad84e27b560f216868a837e385ad3efa
camera: Update HAL API versions and fix warnings

Change-Id: I3d42e81d5099f4c38582ecc21502ae00ef57bcda
Merge branch 'cm-11.0' into kk_mkt