updated cxx-wizard for new toolchain api and for whole-archive

Change-Id: Ia949a0067434b689568a3a7af8a08c97f7b39284