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

* commit 'dfd301f19800a4f168283cf2d0b15b2c09071955':
  Update dump-oat-* and oatdump for new image file layout