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

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

Change-Id: I53a7ad3f406c8a29edbead5ab04c9338d1f4b7c4