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

* commit '6bb8f476862db17adb6f69b441af9059b01c9108':
  Fix missing #includes in bootable/recovery.