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

Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a4 am: f3f26550 am: 8dd2ea72

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

Change-Id: I91cbfe83402880d4b04cb36b7f8a28bd5e19d8bd