camera: add support for 6.4 and 2.5MP (16:9) picture sizes

Change-Id: I275477da95c9450e69c839b89ff5ab806bf1c3cf

Conflicts:

	res/values-de/strings.xml
	res/values/arrays.xml
	res/values/strings.xml