ApfGenerator: fix (and rename) APFv6+ addArithR1

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com
Change-Id: I46a046b6fbf9160f051569a9ceca0fa46625dbe8
3 files changed