Merge "Revert "libbinder: double cost for incorrect wait config""