am 38138bb1: am 645e4397: Merge "AudioTrack: fix position callback after restore"

* commit '38138bb1816e49f3f4e73e5bff2affe3d24a96fc':
  AudioTrack: fix position callback after restore