[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde49d am: 4e5b129705 -s ours am: a7a30a03c0 -s ours

am skip reason: Change-Id I5367b5715c797facd37736eee84651addbaa230d with SHA-1 f7f7cde49d is in history

Change-Id: If660c6d0a8546b3b77e9b8d4f704e5b12d245af2