Merge "Installd: Clean up code related to foreign dex use"