Fix --version to output version

Change-Id: I7d8dc83ac7c2ad7519633d136c1c32ce8537dce8
Fixes: bug 1182675
Merge "Fix --version to output version"