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

Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp

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