Merge "Libhardware: Fix tests"