am ee2e3d3c: am cf69f816: Merge "Move ArtField to native"

* commit 'ee2e3d3c91294d3b4afc61ac935e9e65bfa8638b':
  Move ArtField to native