Merge "Add invoke infos to stack maps" am: 9fb10fb39b
am: 729860e97d

Change-Id: Ibc9517a098dc5ce83359f00a81517dadc7509dde