[automerger skipped] Fix goldfish manifest handling.
am: 294f294cca -s ours
am skip reason: change_id Icb9bae2336e11fe5b1fda532adbee500b2d8dbaf with SHA1 e1ee362a7b is in history

Change-Id: I67c064582cdf75eff1a2117cf5930f2926d7197d