[automerger] goldfish: add vendor.mk am: 268c72fe01 am: aeb18e5c31

Change-Id: I4eed56bb99edc2fc2e8b72a401b50151d48c120c