am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"

* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49':
  Recovery 64-bit compile issues