Merge "Revert "Use libdexfile external API in libunwindstack.""