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

Change-Id: Id54f7f525a5b54d9a6bcdc8c52a0dd4614cb529c