hardware_libhardware: Fix merge

http://gerrit.aokp.co/#/c/13772/

Change-Id: Iab6b0578fe3d6453c7ad00bda6256d54ee67c041
Signed-off-by: Aaron Klein <aaklein@gmail.com>