Merge "Fix dexlayout manual walking of 0 length catch handler."