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

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

Change-Id: I05b2783d868abdbe2ecb9441ef38323ebfd79fa7