Merge "Testables lib should not statically link mockito"