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

* commit 'a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5':
  Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"