Merge "Convert core/xsd/vts/Android.mk file to Android.bp" am: 682de55962 am: 6fc5f5e76e

Change-Id: I14ba372c317fdde507132ece1bf02808fb986528