Revert "Camera2: Enable 10MP and nHD pictures modes"

This reverts commit b32778dd765e1f86e882b53a33ac212c8811cb21.

Change-Id: I38ac7308b29632b1b6fa47ee7cbe3ea913fe3c28