Merge "Revert "Add libdexfile runtime dependency of libdexfile_support.""