am 06fcfc50: am 02e30945: Merge "Fix missing #includes in hardware/libhardware."

* commit '06fcfc506c44724bbd8089e8971b77aa8edfdde8':
  Fix missing #includes in hardware/libhardware.