Merge "fix AudioTrack testPlaybackHeadPositionAfterStop()" into jb-dev