am 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."

* commit '780bc50ded9e26ad51db651d21e1a0d489300793':
  TARGET_SIMULATOR is long dead.