Merge "Add libdexfile.so to the list of libraries needed for tests." am: 97f1e04d86
am: 83eb2a430d

Change-Id: Idae82a573e1d58cd0e523ccc1e5ac17df0b9e8f1