Revert "Improve ArraySet codegen."
am: 0dda8c8493

Change-Id: Ie4c48b97ac238f056268d415288eca1a0931f984