Merge "x86 ART FI clean-up"
am: 4ed2e43bd4

* commit '4ed2e43bd40fb203f54661ce42366e8e86581864':
  x86 ART FI clean-up