am 03cb00b7: Fix sim-eng build.

Merge commit '03cb00b7b37d39f6d599bb148db775a08eb8b04a' into gingerbread-plus-aosp

* commit '03cb00b7b37d39f6d599bb148db775a08eb8b04a':
  Fix sim-eng build.