Merge "Attempt to fix simulator build." into gingerbread