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

Change-Id: I4bfd0f36c5a235579fa2a2203510e47501f1e7a6