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

Change-Id: Ie4d7224ff3677ac9df8cf5c33a14aea993b2de29