Set up a binder watcher for test client
am: f26249aba3

* commit 'f26249aba32d12840fef386112545101b560fd57':
  Set up a binder watcher for test client