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

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

Change-Id: I788d2bdbaffbc9c39f181cb91d57819e09b05c05