Merge "Misc fixes for sim-eng build." into gingerbread