Merge "Remove checkstyle from development/checkstyle." am: 06b3b45f6f
am: 327d16e647

Change-Id: Ie709e761362e291e41836e1e3c658b6d5acbf64c