am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per...
am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev
* commit '43f2e3cf':
Revert "Fix AAC timestamps for multiple aac frames per input buffer"