Camera: add additional picture resolutions

- Adds WGVA, SVGA, XGA, 1.5MP, and 4MP resolutions

Change-Id: I92b8cafdb514de2dc6c99c01a5783540b8c695d6
Merge remote branch 'cm/cm-10.1'