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

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

Change-Id: I3346f70aa23d5ad0c4a3beef7ebd1625fb30801e