Merge "Support for multi-package APK+APEX sessions."