Merge "Add libdexfile.so to the list of libraries needed for tests."