Merge "Common testcase directories: Clean up duplicates"
am: 4d15a84fc0

Change-Id: I02267f1f19aaebcd624980945662941096e865eb