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

Change-Id: Ieeaa383a8bacb317b9ee98e528c366fb55a4f8c3