Merge "Make libdexfile usable from libunwind"