Merge "Add oatdump support for app images"