Merge "Don't include the build number in the adbd binary." am: d9984743e6 am: e8873379bc
am: c330fcdf17

Change-Id: I22d309891b2293bbc1ed9e7f4354d8875629c496