Merge "Move system SDK versions to system manifest"