am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"

* commit 'ac90a24da56ff575220aefd3f3be1fbe2f9111ba':
  Remove obsolete TARGET_SIMULATOR checks