Snap for 4832339 from 08d99ad86a90328bbd5ccee26286da3402181e26 to pi-release

Change-Id: Ie658292dee8defc500ad0e24e05729db59d6855a
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4ec55f7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_binary_host {
+    name: "metalava",
+    srcs: [
+        "src/main/java/**/*.java",
+        "src/main/java/**/*.kt",
+    ],
+    java_resources: ["src/main/resources/**/*"],
+    static_libs: [
+        "kotlin-reflect",
+        "metalava-tools-common-m2-deps",
+        "metalava-gradle-plugin-deps",
+    ],
+    manifest: "manifest.txt",
+}
+
+java_library_host {
+    name: "stub-annotations",
+    srcs: [
+        "stub-annotations/src/main/java/**/*.java",
+    ],
+}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..a03897c
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+
+$(call dist-for-goals,sdk,$(HOST_OUT_JAVA_LIBRARIES)/metalava.jar)
+
+$(call dist-for-goals,sdk,$(HOST_OUT_JAVA_LIBRARIES)/stub-annotations.jar)