am 09aa354d: Merge "Revert "Inline across dex files.""

* commit '09aa354d0d7ff58cb9f028647d81a67648c9e0ba':
  Revert "Inline across dex files."