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

Change-Id: I8b3fa683884606e441340940e52114c5f94bb484