am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"

* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
  recovery: fix building with pointer-to-int errors turned on