Merge "goldfish: update emulator to 5664864"
am: 25bafb1ce0

Change-Id: I2c352c679448ce77db17fd474ee574bdf24d8502