Merge "Do not DCHECK intrinsics with hidden API flags"
am: 02e33ab155

Change-Id: I3263215b6cd353fbe530bdef4e4b3c22bedeae0d