Revert "add aimonb/aviator to 3rdparty"