Merge "Add implementation for hwbinder benchmark service." am: 382a80fd8b am: 75b6a17...

am: 0a249a4f79

Change-Id: I27af30956a482053af6be4ce1a4eb1cee53cf3c9

diff --cc Android.bp
index a12524e,84e11e5..581676e
--- 1/Android.bp
--- 2/Android.bp
+++ b/Android.bp
@@@ -33,8 -13,8 +33,9 @@@ subdirs = 
      "tests/expression/1.0",
      "tests/foo/1.0",
      "tests/foo/1.0/default",
 +    "tests/foo/1.0/default/lib",
      "tests/libhwbinder/1.0",
+     "tests/libhwbinder/1.0/default",
      "tests/msgq/1.0",
      "tests/pointer/1.0",
      "tests/pointer/1.0/default",