Revert^2 "Stack maps: Interleave consecutive varints." am: 6c4ec5c155
am: 86cfc33eab

Change-Id: I0db49b45d588285cf9ed251fe375ad5a76737cc2