Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b
am: f2f3c3b91c

Change-Id: Id03922e268fed3174ca4d63976c31b682c4ab202