Merge "Drop an empty .vpython file pointing at Python 2.7"