Gruntfile cleanup

Change-Id: I43604998687200f046e2a74bfa205df77c164371
Merge "Gruntfile cleanup"