Merge "Fix AudioTrack cannot resume after underrun"