Camera2: Enable 10MP and nHD pictures modes

Change-Id: I69b0e374685757a7abe945a0a45cee7d1a0768ff