am 3ce2454c: (-s ours) Merge "Revert "Temporarily disable due to python-related build issues""

* commit '3ce2454cf75499317caf0c2b19ea0787a1c0af4a':
  Revert "Temporarily disable due to python-related build issues"