DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I79085c58d7eefde765740142a1e7b80bab86fb0d
diff --git a/Android.mk b/Android.mk
index 30aeab7..6326096 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,7 @@
 LOCAL_PACKAGE_NAME := com.replica.replicaisland
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts vts
 
 LOCAL_SDK_VERSION := current