Modify invocation of vtable-dumper. am: c82797e905 am: 28c0931c56
am: 9a7709b16d

Change-Id: I1aeafd2b5546cd9d5e619539e0e5b08d8d859c04