Merge "Support per-package lib dirs for bundled apps"