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

Change-Id: Id4c030d533b5eec5a36d00858793998f5ee48126