Merge "Add test for access thunk inlining." am: e904653945 am: 5be41e1092
am: 59994fc7f2

Change-Id: I118ff9bd2f78ee3c408aa0e8d06bf2c5e7636b1b