Merge "Update dump-oat-* and oatdump for new image file layout"