Snap for 10447354 from 99ba05775fae7b9f7c16d54ea8a2b24b75595cfe to mainline-cellbroadcast-release

Change-Id: Ia06de9dbd79444ad760f85a6ac51829ca954b5ec
diff --git a/Android.bp b/Android.bp
index a027498..fee3adb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,6 @@
         "-DPTHREADPOOL_USE_CPUINFO=1",
         "-DPTHREADPOOL_USE_CONDVAR=1",
     ],
-    c_std: "gnu11",
     header_libs: [
         "fxdiv_headers",
     ],
diff --git a/OWNERS b/OWNERS
index a2cc597..203b753 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,11 +1,2 @@
-butlermichael@google.com
-dgross@google.com
-galarragas@google.com
-jeanluc@google.com
-levp@google.com
+include platform/packages/modules/NeuralNetworks:/NNAPI_OWNERS
 maratek@google.com
-miaowang@google.com
-pszczepaniak@google.com
-slavash@google.com
-vddang@google.com
-xusongw@google.com