Merge "Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general"