Merge "goldfish: update emulator to 5667626" am: a1a31588b6 am: 9847703d1d am: 13dc6a1703
am: 662713e016

Change-Id: I4974c56871da2ee41e24c56bc824c595cfcef44b