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

Change-Id: I8c72c8e011fb60b39ad1121122e92cc60b2db1d6