[automerger skipped] Merge "Change to using sysprop for libgui_tests" into...
[automerger skipped] Merge "Change to using sysprop for libgui_tests" into rvc-dev am: 03187779 am: fc28cca9 am: 4bcd2e5e am: 0eb5c959 -s ours
am skip reason: Change-Id I1825a304c4fe40e3ef9f54e1e8fef05b1f9a2e8f with SHA-1 e6e7d44e is in history
Change-Id: I03bc8bc02a590b4df8cb70534f5d89193b82a860