Merge "goldfish: update emulator to 5667626"
am: a1a31588b6

Change-Id: Ide698bca27e7473da0494522f2f25a6be98ea7db