Merge "Unbreak build by removing bindgen temporarily"