Merge "tweaks to kythe build script"