tree 3bcb5ac7201e41b8e26d8073da8824b6e98fb7dd
parent dc4189f0e4a55e29818991b4e937e5fe01a9be02
author Maciej Żenczykowski <maze@google.com> 1611604891 -0800
committer Maciej Żenczykowski <maze@google.com> 1611635471 -0800

merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion

The keys are identical, and the values nearly so, this will make everyone's life easier.

Test: git grep 'Tether(Down|Up)stream4(Key|Value)' finds nothing
  (note this requires follow up commits)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifbff2c617ac5834ea80f827eaf89ca81e862baec