camera: Remove duplicate scene modes

 * Underped all the things.
 * Also added macro mode

Change-Id: Ibe2937976bbb8879add73e1833afe5a62830876c
camera: Handle alternate face detection score

 * Some cameras use the score field as an error code. Add a config
   to handle this properly.

Change-Id: Iad938e5c31c8a34fc90b1da4b096ce027294e89e
camera: Set magic parameter for Oppo camera

Change-Id: Iff0e9ce6c3930b3546b2308bcf56bcfee5136d9b
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Gallery2 into jb4.3