Merge "Update tests for Conscrypt upstream merge."