resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp

Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1

diff --cc cmds/servicemanager/Android.bp
index bc150cb,0000000..dc8e675
mode 100644,000000..100644
--- 1/cmds/servicemanager/Android.bp
--- /dev/null
+++ b/cmds/servicemanager/Android.bp
@@@ -1,36 -1,0 +1,36 @@@
-     shared_libs: ["libselinux"],
 +cc_defaults {
 +    name: "servicemanager_flags",
 +
 +    cflags: [
 +        "-Wall",
 +        "-Wextra",
 +        "-Werror",
 +    ],
 +    product_variables: {
 +        binder32bit: {
 +            cflags: ["-DBINDER_IPC_32BIT=1"],
 +        },
 +    },
 +
 +    shared_libs: ["liblog"],
 +}
 +
 +cc_binary {
 +    name: "bctest",
 +    defaults: ["servicemanager_flags"],
 +    srcs: [
 +        "bctest.c",
 +        "binder.c",
 +    ],
 +}
 +
 +cc_binary {
 +    name: "servicemanager",
 +    defaults: ["servicemanager_flags"],
 +    srcs: [
 +        "service_manager.c",
 +        "binder.c",
 +    ],
++    shared_libs: ["libcutils", "libselinux"],
 +    init_rc: ["servicemanager.rc"],
 +}