Merge "Revert "Inline across dex files.""