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

* commit 'bdb72318e47d38df2180bd00d0fd0a97bdc82255':
  Remove simulator from the lunch menu