resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp

Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476

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

diff --cc cmds/installd/installd.c
index 3078f20,b54d56c..030502f
--- 1/cmds/installd/installd.c
--- 2/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@@ -77,12 -77,7 +77,12 @@@ static int do_rm_cache(char **arg, cha
      return delete_cache(arg[0], atoi(arg[1])); /* pkgname, userid */
  }
  
- static int do_rm_code_cache(char **arg, char reply[REPLY_MAX])
 -static int do_get_size(char **arg, char reply[REPLY_MAX] __unused)
++static int do_rm_code_cache(char **arg, char reply[REPLY_MAX] __unused)
 +{
 +    return delete_code_cache(arg[0], atoi(arg[1])); /* pkgname, userid */
 +}
 +
 +static int do_get_size(char **arg, char reply[REPLY_MAX])
  {
      int64_t codesize = 0;
      int64_t datasize = 0;

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