Merge "Make vtable-dumper depend on libLLVM_android.so"