Fix the simulator build.

Change-Id: Ie404f7c2c308f0657f273af19a56e8c039b61898
9 files changed