Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a467

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

Change-Id: Id627b0324fd88d069182059a566e353c06c5705b