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

Change-Id: I97db594f79c956cc5c8a0acee5cc83334e3c76c2