Merge "Improved error checking for fsverity_init/odsign."