Add aosp_$(arch) back to the GSI names

Some mixed target tests are still using the aosp_* for the system image.

Bug: 184062970
Test: forrest
Change-Id: I9ed667c26da0dcec26dd4a2ab743ea37e15bed37
1 file changed