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

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