Merge "Fix dexlayout manual walking of 0 length catch handler."
am: 3d0485493e

Change-Id: I7da4c5163112da74c159bfc7e5bfaf5fdf623cc6