[automerger skipped] Merge "Change to using sysprop for libgui_tests" into rvc-dev am: 0318777929 am: cb49ceb45f -s ours

am skip reason: Change-Id I1825a304c4fe40e3ef9f54e1e8fef05b1f9a2e8f with SHA-1 f33c9f1e5f is in history

Change-Id: Ia40a64dcd8cf0ee11f0658554939f42efa415e08