Merge "Revert "Use libdexfile external API in libunwindstack."" am: 5ffa70ec4f
am: 10acdb4a41

Change-Id: I3478db5fa4ec28fcfc9184f35623b8189fd447bf