Revert^2 "Improve ArraySet codegen."
am: 8fa839cfe6

Change-Id: I99d861796f3e867c804bc9fad9afae248b0d2e02