The previous code cropped the width and height correctly when
CONFIG_FRAME_SUPERRES was enabled and we were doing scaling, but
didn't do so the rest of the time.

BUG=aomedia:1020

Change-Id: Ic0ced49b743431504b4ee54b20af69181dcae633