Revert "Revert "Remove overlay logic from package manager and parser""

This reverts commit 08e4756fd3a5d2417f273fab44a70a83180ffa2a.

Change-Id: I10fda3e01e9dcdaa282a299e910e0c70b3c9fd56
2 files changed