Merge "Replace keystore2_vintf's bindgen with cxx"