am 90282d57: am df88a9e4: Merge "x86_64: Enable compilation"

* commit '90282d57b7b62f14fa40a2e59cba9ee1edf4eb40':
  x86_64: Enable compilation