am 6474811d: Fix sim-eng build.

Merge commit '6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp

* commit '6474811d646153aeab111c1c0586b6ee53dcb0d2':
  Fix sim-eng build.