Fix simulator build, part 1/n

Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
2 files changed