Merge up to android-8.1.0_r1 and fix conflicts

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc
2017-12-15 12:48:49 -06:00
parent ea4efc6d20 435a2031d6
commit ecbd3e8ba9
96 changed files with 5341 additions and 4510 deletions
@@ -0,0 +1,4 @@
+subdirs = [
+//    "bootloader_message",
+//    "otautil",
+]