Revert "Camera2: Port additional camera resolutions from CM10.1"

This is causing issues with the ffc preview.. Will need to review before recommiting

This reverts commit 30a5e8e241b6e90822c81d427cdda349eff67bf1.