Merge "Un-disable redefinition tests on JIT." am: c4beddda7c
am: fb5bb033e7

Change-Id: I5e99f9933ad08c8d69fa1377b7ca819368bea285