Merge "Fix vtable boundary check in vndk-vtable-dumper" am: 3369b670ac
am: 7268e66d3a

Change-Id: I6de6b895214f5ff3fb1e838d3a743b9f6e2379d1