am ad059d03: am a2c1db24: Merge "Include the git sha in the adb version."

* commit 'ad059d0318d6e8efc34d8c0a7dedf0caa0758913':
  Include the git sha in the adb version.