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