DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21

Bug: 139893257
Change-Id: If66f00aac018515b8d5774e07ca4cc7911b288fc

24 files changed, 116 insertions, 6 deletions

diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
index b4401d4..60446f0 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "5465364"
+    build_id: "4936746"
     target: "kernel_kasan"
     source_file: "Image.gz-dtb.marlin"
   }
   dest_file: "Image.gz-dtb.marlin_kasan"
-  version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+  version: "Linux version 3.18.100-g0b6976f (android-build@abfarm677) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Aug 7 00:42:05 UTC 2018"
   version_group: "kernel"
   git_project: "device/google/marlin-kernel"
 }
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
index 34e866f..2301ae9 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "5465364"
+    build_id: "4936746"
     target: "kernel_kasan"
     source_file: "Image.gz-dtb.sailfish"
   }
   dest_file: "Image.gz-dtb.sailfish_kasan"
-  version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+  version: "Linux version 3.18.100-g0b6976f (android-build@abfarm677) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Aug 7 00:42:05 UTC 2018"
   version_group: "kernel"
   git_project: "device/google/marlin-kernel"
 }
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
index 7bbd58c..4bd527a 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "5465364"
+    build_id: "5723540"
     target: "kernel"
     source_file: "Image.lz4-dtb"
   }
   dest_file: "Image.lz4-dtb"
-  version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
   version_group: "kernel"
   git_project: "device/google/marlin-kernel"
 }
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
new file mode 100644
index 0000000..c44c4bd
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_api"
+    source_file: "Image.gz-dtb.marlin"
+  }
+  dest_file: "debug/Image.gz-dtb.marlin_debug_api"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
new file mode 100644
index 0000000..8e221b3
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_hang"
+    source_file: "Image.gz-dtb.marlin"
+  }
+  dest_file: "debug/Image.gz-dtb.marlin_debug_hang"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
new file mode 100644
index 0000000..a2d1556
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_locking"
+    source_file: "Image.gz-dtb.marlin"
+  }
+  dest_file: "debug/Image.gz-dtb.marlin_debug_locking"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
new file mode 100644
index 0000000..f5e2ecf
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_memory"
+    source_file: "Image.gz-dtb.marlin"
+  }
+  dest_file: "debug/Image.gz-dtb.marlin_debug_memory"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
new file mode 100644
index 0000000..05884ca
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_kasan"
+    source_file: "Image.gz-dtb.marlin"
+  }
+  dest_file: "debug/Image.gz-dtb.marlin_kasan"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
new file mode 100644
index 0000000..593e016
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_api"
+    source_file: "Image.gz-dtb.sailfish"
+  }
+  dest_file: "debug/Image.gz-dtb.sailfish_debug_api"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
new file mode 100644
index 0000000..2bbd6af
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_hang"
+    source_file: "Image.gz-dtb.sailfish"
+  }
+  dest_file: "debug/Image.gz-dtb.sailfish_debug_hang"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
new file mode 100644
index 0000000..9be032f
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_locking"
+    source_file: "Image.gz-dtb.sailfish"
+  }
+  dest_file: "debug/Image.gz-dtb.sailfish_debug_locking"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
new file mode 100644
index 0000000..c534f36
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_debug_memory"
+    source_file: "Image.gz-dtb.sailfish"
+  }
+  dest_file: "debug/Image.gz-dtb.sailfish_debug_memory"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
new file mode 100644
index 0000000..22d05f9
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
@@ -0,0 +1,11 @@
+drops {
+  android_build_drop {
+    build_id: "5723540"
+    target: "kernel_kasan"
+    source_file: "Image.gz-dtb.sailfish"
+  }
+  dest_file: "debug/Image.gz-dtb.sailfish_kasan"
+  version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+  version_group: "kernel"
+  git_project: "device/google/marlin-kernel"
+}
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index 7db456b..abbc8e6 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
diff --git a/debug/Image.gz-dtb.marlin_debug_api b/debug/Image.gz-dtb.marlin_debug_api
new file mode 100644
index 0000000..f20f407
--- /dev/null
+++ b/debug/Image.gz-dtb.marlin_debug_api
diff --git a/debug/Image.gz-dtb.marlin_debug_hang b/debug/Image.gz-dtb.marlin_debug_hang
new file mode 100644
index 0000000..fbcd54b
--- /dev/null
+++ b/debug/Image.gz-dtb.marlin_debug_hang
diff --git a/Image.gz-dtb.svelte b/debug/Image.gz-dtb.marlin_debug_locking
index 61540d7..77f4865 100644
--- a/Image.gz-dtb.svelte
+++ b/debug/Image.gz-dtb.marlin_debug_locking
diff --git a/Image.gz-dtb.kasan b/debug/Image.gz-dtb.marlin_debug_memory
index 2aa7ccb..eaaa422 100644
--- a/Image.gz-dtb.kasan
+++ b/debug/Image.gz-dtb.marlin_debug_memory
diff --git a/Image.gz-dtb.marlin_kasan b/debug/Image.gz-dtb.marlin_kasan
index 96cd71f..47a2d70 100644
--- a/Image.gz-dtb.marlin_kasan
+++ b/debug/Image.gz-dtb.marlin_kasan
diff --git a/debug/Image.gz-dtb.sailfish_debug_api b/debug/Image.gz-dtb.sailfish_debug_api
new file mode 100644
index 0000000..d2d8537
--- /dev/null
+++ b/debug/Image.gz-dtb.sailfish_debug_api
diff --git a/debug/Image.gz-dtb.sailfish_debug_hang b/debug/Image.gz-dtb.sailfish_debug_hang
new file mode 100644
index 0000000..3bec342
--- /dev/null
+++ b/debug/Image.gz-dtb.sailfish_debug_hang
diff --git a/debug/Image.gz-dtb.sailfish_debug_locking b/debug/Image.gz-dtb.sailfish_debug_locking
new file mode 100644
index 0000000..012b01e
--- /dev/null
+++ b/debug/Image.gz-dtb.sailfish_debug_locking
diff --git a/debug/Image.gz-dtb.sailfish_debug_memory b/debug/Image.gz-dtb.sailfish_debug_memory
new file mode 100644
index 0000000..b2f4d7d
--- /dev/null
+++ b/debug/Image.gz-dtb.sailfish_debug_memory
diff --git a/Image.gz-dtb.sailfish_kasan b/debug/Image.gz-dtb.sailfish_kasan
index ebb8605..44f8787 100644
--- a/Image.gz-dtb.sailfish_kasan
+++ b/debug/Image.gz-dtb.sailfish_kasan