[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: cb49ceb4 -s ours am: 7a3b17e3 -s ours
am skip reason: Change-Id I1825a304c4fe40e3ef9f54e1e8fef05b1f9a2e8f with SHA-1 f33c9f1e is in history
Change-Id: Ib60a570bc52649e56d2fe0ffcb5dce6d0e6fcd03