Merge "Use iterators to access stack map data."
am: a296f908e1

Change-Id: I7d97caa95883ca725a317a372a68c913c17bd60d