Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"