Merge "Rename libdexfile_external_static to libdexfile_static (reland 2)." am: 6c66522dc4

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

Change-Id: Id49edde4bb0614457cb88adba429e9a0faf080ba