Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"

      elif key == "ro.build.display.id":

        # change, eg, "JWR66N dev-keys" to "JWR66N"

        value = value.split()

        if len(value) == 2 and value[1].endswith("-keys"):

          value = value[0]

        if len(value) >  1 and value[-1].endswith("-keys"):

          value.pop()

        value = " ".join(value)

      line = key + "=" + value

    if line != original_line:

      print "  replace: ", original_line