Camera2: add missing 4MP option string

This fixes NullPointerException when selecting picture size.

Change-Id: I1b46b7ebaebb6d9a85ea546acde9eea9231d5c1f
Merge remote-tracking branch 'omni/android-4.4' into omni-4.4