Moved the fix from the previous commit to our code (OnAirPlayer/OnAirPlayer-Android#346).