Merge "Make checker-intrinsic-op less Dexer-sensitive."
am: 9b527174ca

Change-Id: I4389db51fc61578ce4237500d785b84db00876e6