Snap for 4402171 from 25a93c3292315606bcf36cbd1165387f4e1bfd21 to pi-release

Change-Id: I8ea53041ef669eff3fab75280665e88f39c92259

Android.mk

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