Merge changes Iee4ef0a7,If37aa127

* changes:
  Regenerate API usage sample JARs
  build.gradle: Don't specify output.resourcesDir for apiUsageSample
diff --git a/build.gradle b/build.gradle
index 8ee6b41..cd831cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,7 +113,6 @@
         java {
             srcDirs = ['src/test/apiUsageSample']
         }
-        output.resourcesDir = 'build/classes/apiUsageSample'
     }
     debugTestResources {
         java {
diff --git a/tests/d8_api_usage_sample.jar b/tests/d8_api_usage_sample.jar
index eb6f10f..f901b9d 100644
--- a/tests/d8_api_usage_sample.jar
+++ b/tests/d8_api_usage_sample.jar
Binary files differ
diff --git a/tests/r8_api_usage_sample.jar b/tests/r8_api_usage_sample.jar
index d838141..f901b9d 100644
--- a/tests/r8_api_usage_sample.jar
+++ b/tests/r8_api_usage_sample.jar
Binary files differ