Merge "Add file whitelisting capabilities to checkstyle.py" am: 837e792666
am: 04e2e2dc41

Change-Id: I806d82436564853b4f194e3736be7f5458609f6f