[automerger skipped] Merge "Move go default system properties into prop files" am: 47ad7d0f60
-s ours
am: 1be0b776a2
Change-Id: I26ac0fa1990ad0d793ace3bb64508798686e9922
This commit is contained in: