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
Merge remote-tracking branch 'cm-11.0/cm-11.0' into cm-11.0