Make sure android doesn't interfere with master