Merge "libdexfile_external is replaced by libdexfile (reland 2)." am: 8146f21745 am: 20df86b2e3

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

Change-Id: I4052c222aa224f9ec2afe270c2efbe42f30f6bdd