Merge "Fix the simulator build." into gingerbread