Build initialization procedure harmonization

Change-Id: If8c56916235eafb8c6f5587eb9bff49023e5d93c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>