Merge "Revert "Add libdexfile runtime dependency of libdexfile_support."" am: 73e4ce2a45 am: e05cf5b412 am: fe9b9f9ff9

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

Change-Id: Ie9591bfede704a627f7283701734e5b8bfcf1ea0