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

* commit '4fb9f9377e03e1c01b34a7e1b6f3f9be8f78358d':
  Installd: Swap file for dex2oat