Merge "Libhardware: Fix tests" am: de5662d7fa
am: 7edadd7197

* commit '7edadd7197e2bc4665b49f07cb3561120cd4ed1f':
  Libhardware: Fix tests