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

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