Merge "Revert "Rename libdexfile_external_static to libdexfile_static (..."" am: c52d8de29d am: d6919bb01f

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

Change-Id: Ia869b5693ddf554795f3837ea5ea31a3c79fb281