Merge "Fix missing #includes in hardware/libhardware."