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

Change-Id: If1c929924e71344b11a4588870c27159b3bfc38a