libhardware: bring back hwc includes
Merge branch 'kk' of https://github.com/LOSP/android_hardware_libhardware into kk