Merge "Add test config to libgui_test" am: 7f1e92dc64 am: ca8cc51273
am: a485d63540

Change-Id: I03aab5fedd20ada0f10d6865aecd31e843b635eb