Camera2: Use consistent translations for megapixels

Change-Id: If12826cd6a4c11f4b5ccdcd2d7a8166914276da8
Merge branch 'cm-11.0' into kk_mkt