Merge "aacenc: fix possible shift in remainder" into qt-qpr1-dev
am: e3032ea219

Change-Id: Ia0a4af59099162032924b4c80a625631e4d0ee35