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

Change-Id: I67dd216ff77f7cdf41bf91bf934a3b715f19c8e6