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

Change-Id: Ifae8f8f4bd633aca5bb2096e0447b10c2accf1f5