Merge "Replace keystore2_vintf's bindgen with cxx" am: 725dc606f6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1824232

Change-Id: I3d012c00f828edf9fdee3ac850f64e9a5b743f57