am f47b0a17: merge from open-source master

Merge commit 'f47b0a1758a66277d11f362e307f0dd6c183051d'

* commit 'f47b0a1758a66277d11f362e307f0dd6c183051d':
  Add generic_x86-eng to the lunch menu