Redo r111 by leveraging existing merge code to make list and dict copies and fix paths.
Redo r111 by leveraging existing merge code to make list and dict copies and
fix paths.

witwall/gyp,witwall/gyp,witwall/gyp,witwall/gyp,witwall/gyp