resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev

Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664

diff --cc core/Makefile
Simple merge

diff --cc tools/releasetools/build_image.py
index 04ced09,828d71c..ef2c2d6
--- 1/tools/releasetools/build_image.py
--- 2/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@@ -269,8 -256,14 +269,12 @@@ def BuildImage(in_dir, prop_dict, out_f
      build_command = ["mksquashfsimage.sh"]
      build_command.extend([in_dir, out_file])
      build_command.extend(["-m", prop_dict["mount_point"]])
 -    if fc_config is not None:
 -      build_command.extend(["-c", fc_config])
 -    elif "selinux_fc" in prop_dict:
 +    if "selinux_fc" in prop_dict:
        build_command.extend(["-c", prop_dict["selinux_fc"]])
+     if "squashfs_compressor" in prop_dict:
+       build_command.extend(["-z", prop_dict["squashfs_compressor"]])
+     if "squashfs_compressor_opt" in prop_dict:
+       build_command.extend(["-zo", prop_dict["squashfs_compressor_opt"]])
    elif fs_type.startswith("f2fs"):
      build_command = ["mkf2fsuserimg.sh"]
      build_command.extend([out_file, prop_dict["partition_size"]])
@@@ -375,8 -337,8 +379,10 @@@ def ImagePropFromGlobalDict(glob_dict, 
      copy_prop("system_size", "partition_size")
      copy_prop("system_journal_size", "journal_size")
      copy_prop("system_verity_block_device", "verity_block_device")
 +    copy_prop("system_root_image","system_root_image")
 +    copy_prop("ramdisk_dir","ramdisk_dir")
+     copy_prop("system_squashfs_compressor", "squashfs_compressor")
+     copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")
    elif mount_point == "data":
      # Copy the generic fs type first, override with specific one if available.
      copy_prop("fs_type", "fs_type")