hardware_libhardware: Fix merge

Change-Id: I71c966318a26ab7d74c1dd75820ae6eacf2ff2f8
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge remote-tracking branch 'cm/kitkat' into kitkat