Merge "Fix CHECK for is_using_read_barrier_entrypoints"