Upgrade emulator to emu-master-dev build 6629878 am: 3dff88bfdd am: 84d1b420f2

Original change: https://android-review.googlesource.com/c/platform/prebuilts/android-emulator/+/1350776

Change-Id: Ic917d813742679cfdef65e8829b0a19dc6348352