Version numbers are fixed and now headless version cam be built.

Change-Id: I5bc3bbbbd306e6459bbb7be6b848a3384c38f227