Merge branch '1.4' of github.com:google/tink into 1.4