Merge "Revert "Rename libdexfile_external_static to libdexfile_static."" am: b3cb9a6ad3

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

Change-Id: If51748f67351bd7d07d7405502183bddb5a7add3