Merge "Revert "Revert "Inline across dex files."""