Merge "Add a bounds check when getting indexed items in dexlayout." am: 5d3ae5b607 am: ca584e5536 am: 13ba741823
am: 42c3d34cfd

Change-Id: I0b22387f16292cecff2a8e3f6a050c65f15f5e6a