Merge "prereqs: Stop depending on python2"