Merge "[Installd] Clean up logic for secondary dex oat files"