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

Change-Id: I03c398b7d7df3b1dedf46447c57de896b28dc302