Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?"android-o-iot-preview-5o-iot-preview-5

This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and
af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned.

Bug: http://b/64543673
Test: manual + treehugger

1 files changed, 0 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index f806ece..4f159c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,8 +33,6 @@ cc_library {
     ],
     export_include_dirs: ["include"],
 
-    local_include_dirs: ["compat"],
-
     srcs: [
         // core
         "buffer.c",
@@ -48,7 +46,6 @@ cc_library {
         "evthread.c",
         "evutil.c",
         "evutil_rand.c",
-        "evutil_time.c",
         "listener.c",
         "log.c",
         "signal.c",