Recovery 64-bit compile issues

Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
11 files changed