Merge "Adjust to libdexfile API changes" am: 9298bc80c5

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1677785

Change-Id: I7b42d5fd1578a6a802b1fced59c749ff345b30b5