Merge "Buck: Remove Python 2.6 compatibility workarounds"