Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space"