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

* commit '5bc37375f4d1f8c9ecd19bfb611c7fa217d532ec':