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

Change-Id: I8edd3c75cb45c4ea33b7112939006c939310eca6