Add simple-force-redefine agent
am: 74ab975b65

Change-Id: I2879fc6c5df084c23e72f76f3f257d6db5392e84