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

Change-Id: I5c8a78812af6bf4bd071eba3f55d24eec33bafd9