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

Change-Id: I8643ed6e7376e3342705a9965d66fa0b3851dd31