Revert "Reversed order of Indirect and Shared Memory mappings in Addressing."

This reverts commit 41ac549dcf14676514887d17c77d19e43d606426.
New 16x16 increment benchmark