Merge "Make TestableFlagResolver part of the 'testables' lib."