Merge 0be374c40a3c5fbebcf9827dcd53616ca0343225 on remote branch

Change-Id: I4fe728ca6a95f56f7329be46a7e89ade14d2189c
diff --git a/build/gki.go b/build/gki.go
index 208aaf8..e34130b 100644
--- a/build/gki.go
+++ b/build/gki.go
@@ -94,7 +94,7 @@
 }
 
 func testApexBundleFactory() android.Module {
-	return apex.ApexBundleFactory(true /* testApex */, false /* art */)
+	return apex.ApexBundleFactory(true /* testApex */)
 }
 
 // Create modules for a real APEX package that contains an OTA payload.