Simplify more discovery functions

Fold into binder stub, clean up references.

Bug: 145171640
Test: compile & run
Change-Id: I980a1f05fc51ead832bbe34835026f4f3ac10d7f
2 files changed