am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.