am d76a0c79: Merge "Revert "Fix VM-less builds.""

* commit 'd76a0c791b8b7411e7ce7b2046f6af1e3d7bb00a':
  Revert "Fix VM-less builds."