am d24ba2c4: Merge "Inline across dex files."

* commit 'd24ba2c44c76a2b2dd13aafe8f7981c15be31a98':
  Inline across dex files.