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

Change-Id: Ie6b2f53debac8753563df8d705fa184ffc661fe0