[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: 12e5c366 am: bf8bd780 -s ours
am skip reason: Change-Id I1825a304c4fe40e3ef9f54e1e8fef05b1f9a2e8f with SHA-1 f33c9f1e is in history
Change-Id: I886175e191f4caa8f4192e283d84b58d96d847f9