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

Change-Id: Ia6d35f8eae7311da506fa65fd097a4976bb6e2f3