Merge "Remove libdexfile_external_static_defaults again." am: 4894a64e1d

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

Change-Id: If44deabeecd01aa83747e2b490c19927dbbd8188