Merge "Revert "libdexfile_external is being replaced by libdexfile."" am: 89e50ee521

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660249

Change-Id: Ia0cbcdbe0b07a144607a35b983a0b6f0e5c91955