Merge "Add Kind column to stack maps."
am: 60204d2f17

Change-Id: Iddee2d550f44df031f3c164f079e49d0105817f7