Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: c3b941fe28 am: bc0b697d9b am: 8ff4dbe443
am: 4d8f94cf42

Change-Id: Icd8b12444f496c177d5aedcae624a2662c5e960c