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

Change-Id: Ib2890bf418820cdc7709b52bf33a7d7340cdac63