resolve merge conflicts of 25ae0b867611b82d6d2aa27d5191b3f7634fbfd0 to master-layoutlib-native

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I130216d0202c4cfdb581d1fe20a64968cebee353
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..f4aafe8
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,45 @@
+//
+// Copyright (C) 2008 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.
+//
+
+//
+// Define rules to build temp_layoutlib.jar, which contains a subset of
+// the classes in framework.jar.  The layoutlib_create tool is used to
+// transform the framework jar into the temp_layoutlib jar.
+//
+
+java_genrule_host {
+    name: "temp_layoutlib",
+    tools: ["layoutlib_create"],
+    out: ["temp_layoutlib.jar"],
+    srcs: [
+        ":core-libart{.jar}",
+        ":framework{.jar}",
+        ":ext{.jar}",
+        ":icu4j-icudata-jarjar{.jar}", // HOST
+        ":icu4j-icutzdata-jarjar{.jar}", // HOST
+    ],
+    cmd: "rm -f $(out) && $(location layoutlib_create) --create-stub $(out) $(in)",
+}
+
+java_genrule_host {
+    name: "layoutlib-native-delegates",
+    tools: ["layoutlib_create"],
+    out: ["layoutlib-native-delegates.jar"],
+    srcs: [
+        ":framework{.jar}",
+    ],
+    cmd: "rm -f $(out) && $(location layoutlib_create) --create-native-only-delegates $(out) $(in)",
+}