Merge "Refine the binder latency test" into oc-dev am: f18f8fe8cb
am: 320721f8ff

Change-Id: I06a0fd4fbf553f6b10ee37b058f2516f09b797ec