Merge "Merge "aacenc: fix timestamp off by one frame" into qt-dev am:...
Merge "Merge "aacenc: fix timestamp off by one frame" into qt-dev am: 69fb36f0 am: d075995b am: f3f7e1a0" into qt-qpr1-dev-plus-aosp
am: b4461535
Change-Id: I280caffdf220481fc0ff7d81f1bd7d7b2da14108