Fix duplication of CALL_ constants
am: 983fe0e53a

Change-Id: Ifd60e9b4f2d22d94c2618b27f1eeade2bdc6aec8