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

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

Change-Id: I30ac12f0c739f25c743607e4e5b89ee1701b9a9c