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

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