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

Change-Id: I7ddca14a3f3de1a36ac69f1149a87d0999cd5a4d