Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db
am: ab526b1246

Change-Id: I5ce8de6c1bb15f30570428ee106b83356ef3bd90