Merge "Revert "Rename libdexfile_external_static to libdexfile_static (..."" am: c52d8de29d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1671705

Change-Id: I33499097b05d7a08521b377729b0d060104c07a6