Merge "Installd: Swap file for dex2oat"