am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."

* commit 'efc8077246a3e816957a774f3d272b909c1c1b12':