Camera2: add missing 4MP option string

This fixes NullPointerException when selecting picture size.

Change-Id: I1b46b7ebaebb6d9a85ea546acde9eea9231d5c1f
[2/2] Camera2: move oppo-app param to wrapper

But keep oppo config option for overlay - maybe we need it some day

Change-Id: I8eadbcccf981bf5c3373681acd5cfd81ad35e9cb
Merge remote-tracking branch 'omnirom/android-4.4' into kitkat