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

Change-Id: I3b957e990d83c6aab3c948012f63c2f888376646