am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in...
am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev
* commit 'a49c94ea':
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"