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

Change-Id: I280caffdf220481fc0ff7d81f1bd7d7b2da14108