am 5372220a: Merge "Remove simulator from the lunch menu"

* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu