Revert https://github.com/CyanogenMod/android_hardware_libhardware/commit/c3c3eca4acaecda1320f09e955bc65db8f572a27