[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame""...

[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev am: b2f9f22c -s ours am: b279c8c3 -s ours am: f9776558 -s ours
am: d62a7df8 -s ours
am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae9 is in history

Change-Id: I6f24a707e0b0c531dae2d22055e56a395def7e20