Merge "Revert "libsnapshot: Off-line tool for converting OTA payloads t...""