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

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

Change-Id: I086c803d62f062a16e604120c132eba5559b3145