try to fix building of simulators (still broken)

Change-Id: I47a724a4be92b5a528c1780b331bbcacccccefc0