Merge "Fix generic_x86 image sizes."