resolve merge conflicts of 86180eb to nyc-mr1-dev-plus-aosp

Change-Id: Ia4bfb2571bac509cebe22f70ff43e6696f832423

diff --cc core/Makefile
Simple merge

diff --cc tools/releasetools/add_img_to_target_files.py
Simple merge

diff --cc tools/releasetools/build_image.py
index 390c26f,50e81bf..28d70d3
--- 1/tools/releasetools/build_image.py
--- 2/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@@ -559,22 -628,11 +630,28 @@@ def ImagePropFromGlobalDict(glob_dict, 
      copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks")
      copy_prop("system_squashfs_compressor", "squashfs_compressor")
      copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")
 +    copy_prop("system_squashfs_block_size", "squashfs_block_size")
      copy_prop("system_squashfs_disable_4k_align", "squashfs_disable_4k_align")
      copy_prop("system_base_fs_file", "base_fs_file")
+     copy_prop("system_avb_enable", "avb_enable")
+     copy_prop("system_avb_add_hashtree_footer_args",
+               "avb_add_hashtree_footer_args")
 +  elif mount_point == "system_other":
 +    # We inherit the selinux policies of /system since we contain some of its files.
 +    d["mount_point"] = "system"
 +    copy_prop("fs_type", "fs_type")
 +    copy_prop("system_fs_type", "fs_type")
 +    copy_prop("system_size", "partition_size")
 +    copy_prop("system_journal_size", "journal_size")
 +    copy_prop("system_verity_block_device", "verity_block_device")
 +    copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks")
 +    copy_prop("system_squashfs_compressor", "squashfs_compressor")
 +    copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")
 +    copy_prop("system_squashfs_block_size", "squashfs_block_size")
 +    copy_prop("system_base_fs_file", "base_fs_file")
++    copy_prop("system_avb_enable", "avb_enable")
++    copy_prop("system_avb_add_hashtree_footer_args",
++              "avb_add_hashtree_footer_args")
    elif mount_point == "data":
      # Copy the generic fs type first, override with specific one if available.
      copy_prop("fs_type", "fs_type")
@@@ -591,9 -649,11 +668,12 @@@
      copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks")
      copy_prop("vendor_squashfs_compressor", "squashfs_compressor")
      copy_prop("vendor_squashfs_compressor_opt", "squashfs_compressor_opt")
 +    copy_prop("vendor_squashfs_block_size", "squashfs_block_size")
      copy_prop("vendor_squashfs_disable_4k_align", "squashfs_disable_4k_align")
      copy_prop("vendor_base_fs_file", "base_fs_file")
+     copy_prop("vendor_avb_enable", "avb_enable")
+     copy_prop("vendor_avb_add_hashtree_footer_args",
+               "avb_add_hashtree_footer_args")
    elif mount_point == "oem":
      copy_prop("fs_type", "fs_type")
      copy_prop("oem_size", "partition_size")