Merge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop" am: faf2c42
am: 256c15a

* commit '256c15afd371cdf7d19c2c1f3cd2862cf2f7e4a4':
  Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop