Merge "Remove direct dependencies on libhwbinder."