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