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