Merge "PackageManager: Clean up code related to foreign dex use" am: eef66fd0c7
am: b1818b8a36

Change-Id: I41008c4e95cef971702120be285c2a8821168591