Merge "Change to using sysprop for libgui_tests" into rvc-dev am: 0318777929

Change-Id: I07f725698df80db88c343637f126e3924be62be0