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

* commit '6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7':
  Remove obsolete TARGET_SIMULATOR checks