Merge "installd: Replace Dex2oatFileWrapper with UniqueFile"