Merge "Disable DCHECK for an intrinsic with hidden API flags"
am: 000a0ada6b

Change-Id: Ifb14340d68a4cc3c54e7c0db8a6edd12442d5f09