Camera: add additional ISO modes (2/2)

Change-Id: I3460c3de4cbef467430673146a9ddb2fdc8f5032
Merge "Camera: add additional ISO modes (2/2)" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1