Merge changes I6ba4b46a,Ic54579e3

* changes:
  Disable a few bionic tests under HWASan.
  Remove timer_delete_multiple test.
diff --git a/libc/Android.bp b/libc/Android.bp
index 681394f..2ba4f78 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1702,6 +1702,7 @@
     defaults: ["libc_defaults"],
     name: "libc",
     static_ndk_lib: true,
+    export_include_dirs: ["include"],
     product_variables: {
         platform_sdk_version: {
             asflags: ["-DPLATFORM_SDK_VERSION=%d"],