Merge "Merge "aacenc: fix timestamp off by one frame" into qt-dev am: 69fb36f0d1 am: 393728a945" into qt-r1-dev-plus-aosp am: 20ce5600fd
am: 58084bb257

Change-Id: I1c49205d0d0b3c0a8b9997dea06bd86c9c129b73