Merge "Update configure for hwbinder benchmark tests."
am: 5749960eb4

Change-Id: I1449974ebae5124a2dfcb0e21149375ad4b799c5