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

Change-Id: I17a43b8370f68e087c31201fcf29913c9ef28684