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

Change-Id: Ic80ea0694b40a3b197654f422f48268cd8f4ce37