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

Change-Id: I8adb3021154840f80694b1946231805d76355f05