Merge "Fix a test info referencing AMD64 instead of ARM64." am: cf0f856
am: fb8aa37

* commit 'fb8aa3731618d4ac72847f4b00dfe4439efeffd8':
  Fix a test info referencing AMD64 instead of ARM64.

Change-Id: Idc18f1e55771d8db3602b9f93a24ccdba6cc35f9