Merge "Remove mkyaffs2image references."