Merge "releasetools: Remove the workarounds for mkyaffs2image." am: d2a09ef2d1
am: 9c531a9bef

Change-Id: I9d3b97017c05ecc208a231b37219ccd1269d2eb5