Camera2: Enable 10MP and nHD pictures modes

Change-Id: I141f813609105bdcd6d0c55b1fc27c85df16ea16
Merge pull request #20 from CyanogenMod/cm-11.0

Camera2: Enable 10MP and nHD pictures modes