Merge "Fix running tests from IDE" into oc-dev am: bb0caa6a6d am: 07c582f78e

am: af7b7d3171

Change-Id: I09ac002ae204ba0b5f626bcba1f5b8908f1e7a78

init.gradle

@@ -162,7 +162,7 @@ def configureSubProjects() {
                 // since enabling coverage reports breaks the method parameter resolution in the IDE
                 // debugger.
                 project.android.buildTypes.debug.testCoverageEnabled =
-                        !hasProperty('android.injected.invoked.from.ide')
+                        !project.hasProperty('android.injected.invoked.from.ide')
 
                 // Copy the class files in a jar to be later used to generate code coverage report
                 project.android.testVariants.all { v ->