use masked_clumping instead of bug_fixed_clumping.
use masked_clumping instead of bug_fixed_clumping.


Former-commit-id: 5e311dc6d10b9bc944dfa09dfda7f0a1076addaf [formerly 99051cb6ad5dfee8d47b58f506b2f660975a0813] [formerly 2b0eb1f776542b442141dadcee68b3f8404c1ac9 [formerly eaf5f4b145e4e64b6d029ed3d47e7be030b21a60]]
Former-commit-id: 34e01abc6a5f0975f11dad0a78f2c116a2e779e9 [formerly 355e53615b15db6c19534a574efcee4b19a0228e]
Former-commit-id: 62f86669810d87fbe7a3577c8d9f66cd1d385a12
jason-neal/eniric,jason-neal/eniric