Merge "Package manager changes for dual zygote stack."