Merge "Remove libvintf from libandroid_runtime" into main