Merge "Fix missing #includes in bootable/recovery."