am 12d0cd1b: am 3a8bad2e: am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev

* commit '12d0cd1bf756ec96755fae2e573659898bfba6d6':
  Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp