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

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

Change-Id: I654d697aff777433becdda067a9a1ec61e703e5c