Merge "Update tests for Conscrypt sync."