Merge "libvintf_jni requires vintf" into main