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