Temporary workaround to avoid test failures when TARGET_2ND_ARCH is arm. am: ec2db5f88b am: 4cca222da5 am: 9c8d60ea85
am: a8abfd0ebc

Change-Id: I035c838a2da280975ad1b6243f2696a389cf9fc2