Merge "Add libdexfile runtime dependency of libdexfile_support (reland)."