Merge "Improve array index analysis in LSA." am: aed3dbf960
am: 2e694638f8

Change-Id: I6fd04cb36fd27f803e7b5cbdee3f5de8aead0507