Merge "Remove unused libhwbinder references to libtestUtil."