Merge "Make vtable-dumper depend on libLLVM_android.so" am: c9c6ba1d52
am: 0cad25b321

Change-Id: Ib48314386db4eecbeacf0958386e9628e9f66b87