camera: Remove duplicate scene modes

 * Underped all the things.
 * Also added macro mode

Change-Id: Ibe2937976bbb8879add73e1833afe5a62830876c