Merge "Revert "Support multiple app versions across system partitions""