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

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

Change-Id: I8637b43090663f4588e17a846849abe134875388