resolved conflicts for merge of e1daf61d to master

Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9

diff --cc tools/releasetools/img_from_target_files
index 7a32621,871e295..ef0f24c
--- 1/tools/releasetools/img_from_target_files
--- 2/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@@ -110,12 -109,11 +110,12 @@@ def AddSystem(output_zip)
        pass
  
    build_command = []
 -  if OPTIONS.info_dict["fstab"]["/system"].fs_type.startswith("ext"):
 +  fstab = OPTIONS.info_dict["fstab"]
 +  if fstab and fstab["/system"].fs_type.startswith("ext"):
      build_command = ["mkuserimg.sh",
                       os.path.join(OPTIONS.input_tmp, "system"), img.name,
 -                     OPTIONS.info_dict["fstab"]["/system"].fs_type, "system"]
 +                     fstab["/system"].fs_type, "system"]
-     if "system_img" in OPTIONS.info_dict:
+     if "system_size" in OPTIONS.info_dict:
        build_command.append(str(OPTIONS.info_dict["system_size"]))
    else:
      build_command = ["mkyaffs2image", "-f"]