Merge "Simplify codes for BuildSuperImage func"

      return BuildSuperImageFromTargetFiles(inp, out)

    if os.path.isfile(inp):

      with open(inp) as f:

        lines = f.read()

      logger.info("Building super image from info dict...")

      return BuildSuperImageFromDict(common.LoadDictionaryFromLines(lines.split("\n")), out)

      return BuildSuperImageFromDict(common.LoadDictionaryFromFile(inp), out)

  raise ValueError("{} is not a dictionary or a valid path".format(inp))