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

Change-Id: Idfe73b957d1443a15ee2a30bd4f46b715f2014b3