Merge "Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general" am: 7566e467 am: b272b21a am: 41bac014 Change-Id: Id9e2e9b5b9f720635218d16b2d5a65780dea1974