am e10615e7: am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"

* commit 'e10615e7f8749de887c8d25579398ad9e4094077':
  Remove obsolete TARGET_SIMULATOR checks