[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: 2468cb00 -s ours
am: 08d7cdcc -s ours
am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae9 is in history

Change-Id: I3bc9d4a425d08ad51768c0b8cddc30f5eb8a7a82