Upgrade emulator to emu-master-dev build 6993535 am: 8edeeef0b6 am: fad6c2d1b0

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

Change-Id: I5b10b205ae523a4b4f9c47ef1d40bd66f988d773