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