merge Tether{Up,Down}stream6Value -> Tether6Value

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id7738586b6c57f2d14ec94d2eb03e1ac82a41338
4 files changed