am d3255076: Merge "Installd: Swap file for dex2oat"

* commit 'd325507698d8379e431a8c8fefcfafe59956bd88':
  Installd: Swap file for dex2oat