Merge "Frameworks/base: Extract packages after cache pruning" into nyc-dev