...from 2ec76e5d "Make sure swui's pSwResMgr is
initialized in CppunitTest_sw_dialogs_test", across ignorant
f888d171 "split sw screenshots test"

Change-Id: I096e22433317186e1a78855532f2c67bd842f366