Merge changes Id946ab1c,Ifacd01d6

* changes:
  uncrypt: Fix the comparison in FindBlockDevice().
  uncrypt: Replace a few C-strings with std::string.