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

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

Change-Id: I98082b166a27f080e645bca8923ea3d14329f169