am 651b4fb3: Merge "Revert "Revert "Inline across dex files."""

* commit '651b4fb337eba9971bb830d9e037c633e29a6eba':
  Revert "Revert "Inline across dex files.""