Merge "codec2: Fix width and height when output is cropped" into qt-dev
am: c9992148b4

Change-Id: I116974b065b3c4aa7de6fb72107e938450a4c4a0