Merge "Revert "AudioTrack: Add getUnderrunCount()""