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

* commit 'a55e8cfc707f5a0cab5511c3f97e7abd5da8e386':
  x86 ART FI clean-up