Merge "releasetools: Work around the issue with mke2fs created images."