am d69ec35b: am 1aa6708c: Fix the build. Oops.

Merge commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda'

* commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda':
  Fix the build. Oops.
diff --git a/libstdc++/include/cstdlib b/libstdc++/include/cstdlib
index e520543..bb6f5a5 100644
--- a/libstdc++/include/cstdlib
+++ b/libstdc++/include/cstdlib
@@ -42,7 +42,9 @@
 using ::exit;
 using ::abort;
 using ::atexit;
+#if 0 /* MISSING FROM BIONIC */
 using ::on_exit;
+#endif
 
 using ::getenv;
 using ::putenv;