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

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

Change-Id: I22fa9efb93989007584139abc36cf9f98c443197