Merge "Revert "Revert "Update tests for BoringSSL roll."""