resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp

Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba

diff --cc cmds/installd/commands.c
Simple merge

diff --cc cmds/installd/installd.c
index 4864516,5b8a1e3..86f7468
--- 1/cmds/installd/installd.c
--- 2/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@@ -42,7 -42,12 +42,12 @@@ static int do_dexopt(char **arg, char r
      return dexopt(arg[0], atoi(arg[1]), atoi(arg[2]), arg[3], arg[4], atoi(arg[5]), 0);
  }
  
 -static int do_mark_boot_complete(char **arg, char reply[REPLY_MAX])
++static int do_mark_boot_complete(char **arg, char reply[REPLY_MAX] __unused)
+ {
+     return mark_boot_complete(arg[0] /* instruction set */);
+ }
+ 
 -static int do_move_dex(char **arg, char reply[REPLY_MAX])
 +static int do_move_dex(char **arg, char reply[REPLY_MAX] __unused)
  {
      return move_dex(arg[0], arg[1], arg[2]); /* src, dst, instruction_set */
  }