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

Change-Id: Ifd0eee397dadf142f77b9c6df8e702bea1ada47c