Misc fixes for sim-eng build.

Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
2 files changed