[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 am: 5402f05b am: 2b30f27d am: a42a566d -s ours

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

Change-Id: I1c98c55a1d3e935b8b24a60dcd9faa48fe0b24d1