am 2b72d68e: (-s ours) am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind"

* commit '2b72d68eb8e01de304103785f02b1f3859f055cc':