Merge "Rename libdexfile_external_static to libdexfile_static (reland)." am: 6106d8cbdd

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

Change-Id: If9fcbca9d070c61707ad0265fd70ebfe8e3205dd