Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ibba31681b3f925161b5b7f9a2fa011fb28d94478
diff --git a/Android.bp b/Android.bp
index a3f2d60..4a1b999 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,3 +17,43 @@
     export_include_dirs: ["include"],
     vendor_available: true,
 }
+
+cc_binary_host {
+    name: "flatc",
+
+    cppflags: [
+        "-fsigned-char",
+        "-pedantic",
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+        "-Werror=shadow",
+        "-Wno-implicit-fallthrough", // in idl_gen_general.cpp and reflection.cpp
+    ],
+
+    local_include_dirs: [
+        "grpc",
+        "include",
+    ],
+
+    srcs: [
+        "src/code_generators.cpp",
+        "src/flatc.cpp",
+        "src/flatc_main.cpp",
+        "src/idl_gen_cpp.cpp",
+        "src/idl_gen_fbs.cpp",
+        "src/idl_gen_general.cpp",
+        "src/idl_gen_go.cpp",
+        "src/idl_gen_grpc.cpp",
+        "src/idl_gen_js.cpp",
+        "src/idl_gen_json_schema.cpp",
+        "src/idl_gen_php.cpp",
+        "src/idl_gen_python.cpp",
+        "src/idl_gen_text.cpp",
+        "src/idl_parser.cpp",
+        "src/reflection.cpp",
+        "src/util.cpp",
+        "grpc/src/compiler/cpp_generator.cc",
+        "grpc/src/compiler/go_generator.cc",
+    ],
+}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d533b1a
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,18 @@
+name: "flatbuffers"
+description: "FlatBuffers is an efficient cross platform serialization library for C++, C#, C, Go, Java, JavaScript, TypeScript, PHP, and Python."
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "http://google.github.io/flatbuffers/"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/google/flatbuffers.git"
+  }
+  version: "85b131a719b3ca554a6cf4840f8ec27feb60ec07"
+  last_upgrade_date {
+    year: 2017
+    month: 12
+    day: 6
+  }
+}