Merge "Add oatdump support for app images" into nyc-dev