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