Merge "goldfish: update emulator to 5667626"