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

Change-Id: Ic48a003b5e258243459b1f3092dca4396f5b2a42