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

Change-Id: I1598a1aa314a2ec550596a4f92390a71d9cd6137