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

Change-Id: Ie74f1575305a71aecf19237d14568ac8a6f72fb2