Merge "Revert "Allow method references across oat files for multi-image.""