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

Change-Id: I795c0c7ff0342526e45ddfffa9f72e5e429b16b4