Merge "Add support for non-virtual thunk." am: 0d323c12df
am: a302ae3b6e

Change-Id: I5a1e361c897edfd1a7fd2f93404b4661d37d7a5d