Merge "Frameworks/base: Refactor package manager"