Merge "Convert core/xsd/vts/Android.mk file to Android.bp"