Merge "Revert^2 "Convert system/libvintf/Android.mk to Android.bp"" into main