Camera2: Fix AOSP mismerge

These changes missed the 4.4.3 merge
Also fix some megapixel inconsistencies, again!

Change-Id: Ic27e4fc8a7eee4261305c38f139405e1223d61bb
Automatic translation import

Change-Id: I5f47d0e0a8ff547328beb9f09950b65d61b07fbf
Automatic translation import

Change-Id: I29b60108fece8fcec4f143b9e00264a7be9fcf7f
Automatic translation import

Change-Id: Ia16e58ba3bcae21c2d3c7eadba79b0c4020185de
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kk