Merge "Reduce code repetition in stack maps with macros." am: dc53f1616d
am: 7e97aa63fa

Change-Id: I11096cf84962e393e96c341ad7d6906539158dda