Merge "image: Allow methods with code in another oat file to work correctly"