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

This reverts commit 8c6908a204f6f25df4a5ce01c91e3c99481a8b11.