am 18e6cf15: Merge "ART: Fix an error in proxy_invoke stub on ARM64"

* commit '18e6cf15644a11c1ef5e500667e6e24675d3eecd':
  ART: Fix an error in proxy_invoke stub on ARM64