Revert "Camera2: Add 50MP, 37.5MP resolution entry"

* Surface SuperZoom as an actual option instead of a resolution.

This reverts commit 1fb26519d9989bb40c750752885f6e8656c420d9.

Change-Id: Ie8f858e0ff1fda81c548c5a10d82dc24d6c98fc6
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0