Merge 7dd747554250ea6875fac0c741f9a3fc570792cf on remote branch

Change-Id: Ie400c7b349d12358a94ec772c901df08e358b9e9
diff --git a/Android.bp b/Android.bp
index 8b264cd..158f266 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,7 +44,7 @@
         "-Wno-unused-parameter",
         "-Wno-unused-variable",
     ],
-    export_include_dirs: ["."],
+    export_system_include_dirs: ["."],
 }
 
 // Library for the device