Merge "Fix the AT_HWCAP2 test."