am ecb5dd69: Merge "Fix undefined args access for x86_64."

* commit 'ecb5dd697ca72828079bf40f932abf9f9ee7b7db':
  Fix undefined args access for x86_64.