Combine apt-get install lines, per PR comment