Merge "Plumb through volume UUID when building paths."

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

diff --cc cmds/installd/installd.cpp
Simple merge

diff --cc cmds/installd/installd.h
index cf5e21f,15fc2d9..4395941
--- 1/cmds/installd/installd.h
--- 2/cmds/installd/installd.h
+++ b/cmds/installd/installd.h
@@@ -226,13 -220,13 +225,13 @@@ int get_size(const char *uuid, const ch
               int64_t *codesize, int64_t *datasize, int64_t *cachesize, int64_t *asecsize);
  int free_cache(int64_t free_size);
  int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *pkgName,
 -           const char *instruction_set, bool vm_safe_mode, bool should_relocate, bool debuggable, 
 -           const char* outputPath);
 +           const char *instruction_set, int dexopt_needed, bool vm_safe_mode,
 +           bool debuggable, const char* oat_dir);
  int mark_boot_complete(const char *instruction_set);
  int movefiles();
- int linklib(const char* target, const char* source, int userId);
+ int linklib(const char *uuid, const char* target, const char* source, int userId);
  int idmap(const char *target_path, const char *overlay_path, uid_t uid);
- int restorecon_data(const char* pkgName, const char* seinfo, uid_t uid);
+ int restorecon_data(const char *uuid, const char* pkgName, const char* seinfo, uid_t uid);
  int create_oat_dir(const char* oat_dir, const char *instruction_set);
  int rm_package_dir(const char* apk_path);
  int calculate_oat_file_path(char path[PKG_PATH_MAX], const char *oat_dir, const char *apk_path,