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

* commit 'c63662a23c156ad6bacaf5d3524adbc2914dd712':
  AudioTrack: fix position callback after restore