Merge "Allow instrumenting android_test modules."
diff --git a/java/app.go b/java/app.go
index 3f72ec9..e90c388 100644
--- a/java/app.go
+++ b/java/app.go
@@ -250,6 +250,8 @@
 	module := &AndroidTest{}
 
 	module.Module.deviceProperties.Optimize.Enabled = proptools.BoolPtr(true)
+
+	module.Module.properties.Instrument = true
 	module.Module.properties.Installable = proptools.BoolPtr(true)
 
 	module.AddProperties(