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

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

Change-Id: Ie05ee31a915abf9278c3768dea66d47ac3cf1071