Merge up to android-8.1.0_r1 and fix conflicts

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..07fc27d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,4 @@
+subdirs = [
+//    "bootloader_message",
+//    "otautil",
+]