Fix CM <-> 4.3 merge conflict.

Thanks to AOSP-Plus:
 https://github.com/Pure-Aosp/android_hardware_libhardware/commit/790a8a41ae9855d4c0879576fb72d4625f0e9039
 https://github.com/Pure-Aosp/android_hardware_libhardware/commit/c50fddc1b68964a349691faf208b5c9dd0210956