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

Change-Id: I4a335ba2babcf30ff6f8549bc0c7f38cab17ec0c