Merge "Base64: Strip out code JGit doesn't use"