Merge "Add test dependency on dexlist"