Merge \"Remove obsolete MTD support from the releasetools scripts.\"

am: 63fc2b6766

Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c

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

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

diff --cc tools/releasetools/edify_generator.py
index 72571eb,5c67ba1..3028b2a
--- 1/tools/releasetools/edify_generator.py
--- 2/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@@ -176,11 -173,10 +176,11 @@@ class EdifyGenerator(object)
      self.script.append(
          'apply_patch_check("%s"' % (filename,) +
          "".join([', "%s"' % (i,) for i in sha1]) +
 -        ') || abort("\\"%s\\" has unexpected contents.");' % (filename,))
 +        ') || abort("E%d: \\"%s\\" has unexpected contents.");' % (
 +            common.ErrorCode.BAD_PATCH_FILE, filename))
  
    def Verify(self, filename):
-     """Check that the given file (or MTD reference) has one of the
+     """Check that the given file has one of the
      given hashes (encoded in the filename)."""
      self.script.append(
          'apply_patch_check("{filename}") && '