Merge "Change to using sysprop for vrflinger_test"