Merge "Revert "Use Jack to check build""