am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"

* commit 'faa68200661eea15f5b3962386d325609e1f90a8':
  x86: Add in the VirtualBox emulator as a separate build target