Merge "Installd: Clean up code related to foreign dex use" am: 62b34b57c4
am: 9d4819ff2e

Change-Id: I21299c36def0a5aa5e202d381abd4ad184c2e7b6