Fixing link issues in crosswalk build