Merge "aacenc: fix possible shift in remainder"