CameraWrapper: Add ISO params

Change-Id: I1c1b15251d9f074a8cb298d966207c4da7607cd5
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0