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

Change-Id: Ia5d992ca3ab1f127b193c505bf37690e97ed3628