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

Change-Id: If0b483aed7be56e8fbab5e5b6939b74f23b37b7d