am 3d5872eb: Merge "ART: Reorder entrypoint argument order"

* commit '3d5872eb090a04a9444b5621d381eec3846f47a3':
  ART: Reorder entrypoint argument order