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

Change-Id: I8829151217e4f36e16d18547f175dfbfeeaff3e1