Camera2: Port additional resolutions from cm-10.2

Also:
* Fix some incorrectly named resolutions
* Mark widescreen resolutions (like AOSP)

Change-Id: I88a318ab4ac97e4dc335cf5fb77596d731a835ec
Merge branch 'cm-11.0' into martincz