Merge "image: Allow methods with code in another oat file to work correctly" am: f5a28f77ab
am: 08068e8dbd

* commit '08068e8dbd082769552fddd3727c541db38ee5d0':
  image: Allow methods with code in another oat file to work correctly