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

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

Change-Id: Ifda9013862cd84c93c471b41b9f7261fc11939ac