Merge "Prepare mincrypt tools for move to recovery repo."