Camera: Unbreak resolutions

* Remove duplicate resolutions
* Fix AOSP mismerges
* Move hardcoded resolution names to strings
* Unbreak order of low resolutions

Change-Id: I1c5bfb78691c14792e8e09bcdfdcdd62f23f7eab