Merge "Add heap reference size to the checks in arch_test"