Revert "ApfGenerator - remove unused add{Div,Mul}{,R1}" This reverts commit cc928fa38424aa14030a888a5755c8ce713ac357. Change-Id: Iab24faf5bb9368a59e69f7b4da760ce28985992b