We needed to change the sample translation a little, because
Python 3 requires encoding metadata.
We also remove workarounds for a specific bug in the subprocess
module, which were needed on Python 2.6 only.
Change-Id: Ie7791297cab16a649880088fa9eae6b4f95855f7