Merge "PackageManager: Clean up code related to foreign dex use" am: eef66fd0c7 am: b1818b8a36
am: d89f0f7c44  -s ours

Change-Id: I1a31c374c1ed665b0bdae6c4169e50fa40f70906