Revert "Camera: Fix moar within enableAspectRatioFixes()"

This reverts commit c44c09667c6e7d9ce03b77de69906becea3c8699

Change-Id: I1b31caffcd49784ed97d2b70eafc29afcd87ce65
Merge "Revert "Camera: Fix moar within enableAspectRatioFixes()"" into jb-mr1