Merge "Remove "stack_map.h" include from code_generator." am: dd5f539e39
am: 4676c0c9db

Change-Id: I3d343708c724c2f489c0d0f65e742e50e69b46e7