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