am 2eaf7138: Cleanup a few issues with the cryptfs code.

* commit '2eaf7138528d30c331d83ab8346a97e66b5499e2':
  Cleanup a few issues with the cryptfs code.