Merge "releasetools: Drop the support for file-based OTA generation." am: 9bca43858f am: aac8098d61
am: 3b848d039d

Change-Id: I9b6cb2b6502f9c9997cf0730710b9585cab4e0a5