Camera2: Enable 10MP and nHD pictures modes

Change-Id: I141f813609105bdcd6d0c55b1fc27c85df16ea16

Conflicts:
	res/values/cm_strings.xml

	modified:   res/values/arrays.xml
	modified:   res/values/strings.xml