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

Change-Id: Ib6d7e02f29919ef425537b7772098519319a845a