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

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