[automerger skipped] resolv_gold_test: assert if parse the .pbtxt files failed...

[automerger skipped] resolv_gold_test: assert if parse the .pbtxt files failed am: 39837353 -s ours am: 206fe462 am: 8a1b0cc3 am: e84a48c1 -s ours

am skip reason: Change-Id I4d15a153d51c526edb841e09c5a6a47f413f1863 with SHA-1 1c4eaaf1 is in history

Change-Id: Ie3c5e495b2a679b9e9a34a0eebf60c09ca63c377