Merge "Fix integer overflow in libgui_test Surface_test"