Merge "Show thunk symbols in vtables" am: 321b110998
am: cda676761a

Change-Id: Ib8e23209642df478211893abbe858972d7a92caf