am 5431564f: am e773281e: Merge "fix AudioTrack testPlaybackHeadPositionAfterStop()" into jb-dev

* commit '5431564fc412bc159d6afcd2cdc52ac6fb9e4a56':
  fix AudioTrack testPlaybackHeadPositionAfterStop()