Merge "Use libdexfile external API in libunwindstack." am: 1d6969ccb9
am: 6b2cd22482

Change-Id: Ib39578faa968fc4a48a6bf02469055142bac20a6