Merge "Fix sim-eng build." into gingerbread