Merge "releasetools: Remove dead functions in EdifyGenerator." am: c87b38f547 am: debedc3343
am: dc880f5122

Change-Id: I23189ca7272094c65dd3d8aa7ed28ad8b5a2606d