Merge "Unbreak build by removing bindgen temporarily" am: 4ddf7eec71 am: df4511fcf0

Original change: https://android-review.googlesource.com/c/platform/development/+/2643126

Change-Id: I82cdb47cac9c84ba194d602809a418a75ae1551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>