Merge "golfish: bump emulator build to 5771857"