[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 am: ae812ab6 -s ours am: 7f8a81f3 am: 870eeb9a -s ours

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

Change-Id: I10b2d454083575eb6eae7a80e80dfdea39db1377