Merge "Add tests/test-data/ to test file list for Checkstyle" am: aa2ea17237 am: 646db5802a
am: a12b72439c

Change-Id: Ia0590e9b45656d8303d6bfea92e153ca247196c6