Switching to npm grunt-crosswalk, some cleanup.