Merge "Fix a libartd.so boot DCHECK failure with the GSS collector."