Android O MR1 Preview 1
Fix hwbinder performance benchmark.
am: 867bd98131

Change-Id: I3c725f447ab50263909fbb1618c6a393dc7ec6fc