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

Change-Id: I2ce533dc69a0297c54f7df94e25b278607fc9462