Merge "Prepare mincrypt tools for move to recovery repo." am: 511e943855
am: 81b546e0ea

* commit '81b546e0ea9eefa48b48594ed4d87dd6d78315fc':
  Prepare mincrypt tools for move to recovery repo.