Revert "Merge commit 'refs/changes/26/76626/6' of http://review.cyanogenmod.org/CyanogenMod/android_hardware_libhardware into 5.0"

This reverts commit 12a8de8bc71808e680e12f625509a79783064cde, reversing
changes made to dc05af34535f234f9e815727f1186d2dd79bea28.