Merge "aacenc: fix timestamp off by one frame" into qt-dev am: 69fb36f0d1
am: 393728a945

Change-Id: Ie9499b015544265161b28b3a3cb425700c75bbae