Camera: add additional ISO modes (1/2)

Change-Id: I15483b24b356acea3f1f5bece63f806dd7383dbc
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1