am efca2263: am cc4d11c2: Merge "Fix sim-eng build." into gingerbread

Merge commit 'efca22636f4036da32f2f6734926442f5ebb422b'

* commit 'efca22636f4036da32f2f6734926442f5ebb422b':
  Fix sim-eng build.