resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp

Change-Id: I4ec33904a6af38d81b422c7be6f40b828fbc7525
diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp
index 6a5e369..d7166df 100644
--- a/tests/component/verifier_test.cpp
+++ b/tests/component/verifier_test.cpp
@@ -46,6 +46,7 @@
     void SetStage(int, int) { }
     void SetLocale(const char*) { }
     void SetBackground(Icon /*icon*/) { }
+    void SetSystemUpdateText(bool /*security_update*/) { }
 
     void SetProgressType(ProgressType /*determinate*/) { }
     void ShowProgress(float /*portion*/, float /*seconds*/) { }