am d9f1736a: Merge "Remove check for TARGET_SIMULATOR"

* commit 'd9f1736a1be0a9e9c29b35b38e24a498129abdbb':
  Remove check for TARGET_SIMULATOR