Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev