Merge "Fix sim-eng build on Hardy" into gingerbread