Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':

Change-Id: I5b0c8a08fd905c897274dc6ed002c2952107a20a
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 84b90af..d5b522b 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -7,7 +7,6 @@
         enabled: true,
         support_system_process: true,
     },
-
     srcs: [
         "rsCpuCore.cpp",
         "rsCpuExecutable.cpp",
diff --git a/tests/java_api/Android.mk b/tests/java_api/Android.mk
index d070b87..54845a1 100644
--- a/tests/java_api/Android.mk
+++ b/tests/java_api/Android.mk
@@ -36,7 +36,11 @@
 
 include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
 
+.PHONY: RSUnbundledTests19
+RSUnbundledTests19: $(my_package_zip)
+
 $(call dist-for-goals,RSUnbundledTests,$(my_package_zip):$(my_package_name).zip)
+$(call dist-for-goals,RSUnbundledTests19,$(my_package_zip):$(my_package_name).zip)
 
 
 # RSTests