am 18c00089: Merge "Misc fixes for sim-eng build." into gingerbread

Merge commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp

* commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb':
  Misc fixes for sim-eng build.