Merge "Rename libdexfile_external_static to libdexfile_static." am: 95ec1431aa am: 0b8a7277ce

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

Change-Id: I89030b1cd44327cd2f6594d10af7248645fb748a