Merge "Revert "Rename libdexfile_external_static to libdexfile_static."" am: d3192c84d5 am: 503c4d47d3

Original change: https://android-review.googlesource.com/c/platform/cts/+/1660245

Change-Id: Id5493c37a383fddfa937e9e8d6655676eb8a8e1c