Merge "releasetools: Remove the workarounds for mkyaffs2image."