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

Change-Id: I17af9d2be44855c81543dda2346ef415a5308492