Merge "libbinder: double cost for incorrect wait config"