Revert "Revert "Merge branch 'master' of https://android.googlesource.com/platform/hardware/libhardware into jb-devel_topic_master""

This reverts commit d40b8cd2008df512062db714635dee7d23fb4c54.