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

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

Change-Id: I4760d6996ad0a191da9292e402ace4c2eb454ebe