Merge "Revert^2 "Use libdexfile external API in libunwindstack."" am: 8478e56580
am: 46e34601b8

Change-Id: I1e692428c71f4a351e667e86d4b07aa2e6dce10e