am 538d7d83: Merge "Fix missing #includes in bootable/recovery."

* commit '538d7d838d82e29c738145431aa64c587dc84943':
  Fix missing #includes in bootable/recovery.