Revert "Improve ArraySet codegen." am: 0dda8c8493
am: 941554b20d

Change-Id: Ic1bd9205598e4d3a6aaed9fdfcd5d8bc502b34be