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

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

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