Merge "Make checker-intrinsic-op less Dexer-sensitive." am: 9b527174 am: 56884929 am: f3b3dd5f am: ea52c960 Change-Id: Ibd88baaa93acb132235ee722cee6e86b4980366f