resolved conflicts for merge of 18c00c5c to master

Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2

diff --cc core/Makefile
Simple merge

diff --cc tools/releasetools/img_from_target_files
index ef0f24c,f10af49..488226f
--- 1/tools/releasetools/img_from_target_files
--- 2/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@@ -61,11 -61,10 +61,11 @@@ def AddUserdata(output_zip)
    img = tempfile.NamedTemporaryFile()
  
    build_command = []
 -  if OPTIONS.info_dict["fstab"]["/data"].fs_type.startswith("ext"):
 +  fstab = OPTIONS.info_dict["fstab"]
 +  if fstab and fstab["/data"].fs_type.startswith("ext"):
      build_command = ["mkuserimg.sh",
                       user_dir, img.name,
-                      fstab["/data"].fs_type, "userdata"]
 -                     OPTIONS.info_dict["fstab"]["/data"].fs_type, "data"]
++                     fstab["/data"].fs_type, "data"]
      if "userdata_size" in OPTIONS.info_dict:
        build_command.append(str(OPTIONS.info_dict["userdata_size"]))
    else: